garmin_fs: Use macros for "flagged" waypoint fields.

diff --git a/gpsbabel/garmin_fs.c b/gpsbabel/garmin_fs.c
index 2a584b9d72c87cffeef15ffc38d36169307a7487..f20e0e9f451461da30f3a601097a6ae64cd1811f 100644 (file)
--- a/gpsbabel/garmin_fs.c
+++ b/gpsbabel/garmin_fs.c
@@ -102,9 +102,9 @@ garmin_fs_xml_fprint(gbfile *ofd, const waypoint *waypt)
        if (gmsd == NULL) return;
        
        if ((gmsd->flags.category && gmsd->category) || 
-            waypt->wpt_flags.depth || 
-            waypt->wpt_flags.proximity || 
-            waypt->wpt_flags.temperature || 
+            WAYPT_HAS(waypt, depth) || 
+            WAYPT_HAS(waypt, proximity) || 
+            WAYPT_HAS(waypt, temperature) || 
             gmsd->flags.display)
        {
                int space = 1;